bitkeeper revision 1.1523 (4292e3afzZhOD910qby84MZZyEFPZQ)

[PATCH] qemu-unregister-c0000.patch

QEMU fixes

 - VMX domain owns 0xcxxxx.
 - guard the fprintf with a log level check

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c
index 7bd85e7372405db7d9973848f965019bd5af0251..11bc03dd4aa783b098ee89903a737a21d8f1e78b 100644 (file)
--- a/tools/ioemu/hw/pc.c
+++ b/tools/ioemu/hw/pc.c
@@ -419,11 +419,11 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
     ret = load_image(buf, phys_ram_base + vga_bios_offset);
 #endif 
 
+#ifndef NOBIOS
     /* setup basic memory access */
     cpu_register_physical_memory(0xc0000, 0x10000, 
                                  vga_bios_offset | IO_MEM_ROM);
 
-#ifndef NOBIOS
     /* map the last 128KB of the BIOS in ISA space */
     isa_bios_size = bios_size;
     if (isa_bios_size > (128 * 1024))

diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c
index ae8b763ea2a5450c3a398331b6b79565a2192b5c..6ac4349fc5506f7f35533f517e8002983347eb8b 100644 (file)
--- a/tools/ioemu/target-i386-dm/helper2.c
+++ b/tools/ioemu/target-i386-dm/helper2.c
@@ -313,7 +313,8 @@ do_interrupt(CPUState *env, int vector)
 
        intr = &(((vcpu_iodata_t *) shared_page)->vp_intr[0]);
        atomic_set_bit(vector, intr);
-        fprintf(logfile, "injecting vector: %x\n", vector);
+        if (loglevel & CPU_LOG_INT)
+                fprintf(logfile, "injecting vector: %x\n", vector);
        env->send_event = 1;
 }